projects
/
project
/
bcm63xx
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39bc12d
)
spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import
author
Ying Zhang
<
[email protected]
>
Thu, 20 Jun 2013 08:04:24 +0000
(16:04 +0800)
committer
York Sun
<
[email protected]
>
Tue, 20 Aug 2013 16:46:57 +0000
(09:46 -0700)
The functionality env_import will be used in the SPL. They
had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it
into the SPL.
Signed-off-by: Ying Zhang <
[email protected]
>
Acked-by: Tom Rini <
[email protected]
>
Acked-by: York Sun <
[email protected]
>
common/env_common.c
patch
|
blob
|
history
diff --git
a/common/env_common.c
b/common/env_common.c
index f387f9ab91f6897acb24b1e55c204279f6e26657..1ac337730c3ec0d1f467e951497cfa1c5be16c6b 100644
(file)
--- a/
common/env_common.c
+++ b/
common/env_common.c
@@
-140,7
+140,6
@@
int set_default_vars(int nvars, char * const vars[])
H_NOCLEAR | H_INTERACTIVE, nvars, vars);
}
-#ifndef CONFIG_SPL_BUILD
/*
* Check if CRC is valid and (if yes) import the environment.
* Note that "buf" may or may not be aligned.
@@
-172,7
+171,6
@@
int env_import(const char *buf, int check)
return 0;
}
-#endif
void env_relocate(void)
{